release-process: update based on 8.5.0RC1 and discussions #19939
+65
−21
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
DanielEScherzer
commented
Sep 23, 2025
DanielEScherzer
commented
- Add PHP 8.5 release schedule link
- Note that the patch-level branch for PHP X.Y.0 is created as part of the last planned release candidate
- Clarify when patch-level branches are pushed
- Add a hint about the values for API versions
* Add PHP 8.5 release schedule link * Note that the patch-level branch for PHP X.Y.0 is created as part of the last planned release candidate * Clarify when patch-level branches are pushed * Add a hint about the values for API versions
edorian
approved these changes
Sep 26, 2025
Member
Author
edorian
approved these changes
Oct 22, 2025
edorian
reviewed
Oct 22, 2025
edorian
reviewed
Nov 4, 2025
| Do not forget to merge up PHP-X.Y all the way to master. When resolving | ||
| the conflicts, ignore the changes from PHP-X.Y in higher branches. It | ||
| means using something like `git checkout --ours .` when on PHP.X.Y+1 or | ||
| master after the merge resulting in the conflicts. |
Member
There was a problem hiding this comment.
Maybe this could use an example and maybe a reminder to set up merge.NEWS from https://wiki.php.net/vcs/gitfaq ?
Member
Author
There was a problem hiding this comment.
Didn't have a good example (assuming you mean an example command to run; if you meant an example commit happy to add a link) but added a link to the merge driver instructions
NattyNarwhal
approved these changes
Nov 4, 2025
Member
NattyNarwhal
left a comment
NattyNarwhal
left a comment
There was a problem hiding this comment.
I remember the bit about the last RC being confusing last cycle; I think this clarifies this well.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.